This reverts commit 6b8b9448. The actual 215-17 upload didn't contain this commit, so revert it for now.