Revert 568b3c8..cab893e

This rolls back to commit 568b3c8720a7d5d4aa5958c16f2f63d977758f34.