Revert 94bd718..4ec3c06

This rolls back to commit 94bd7183224ba04c37d81d6b08a4fb3f8b39281b.