Revert cee8c5d..0036198

This rolls back to commit cee8c5d82c20f472d768cccc7ef12ee731fcb88b.