Revert 45cbcb9..2f3d201

This rolls back to commit 45cbcb97eae29d179df3170839cc2c2ce6f76c89.