Revert 5d1b922..1fdb512

This rolls back to commit 5d1b922fa1ba5a44139ebdb8c818298fb84313e0.