Revert 00b25f4..92c8669

This rolls back to commit 00b25f482c7fb83d646227aee81da10d6a9dbcba.