Revert 0966b5b..4ee16ed

This rolls back to commit 0966b5b90dcf7987049ed2a05b0140dc99b7d494.