Revert 42104c2..85c37a8

This rolls back to commit 42104c20db73fda754e6f4dd4f91b8806c6ec625.