Revert 2fc6268..52639da

This rolls back to commit 2fc6268059f04b32909f5b766c5b74cfe4410a44.