Revert 05dad0c..7ded605

This rolls back to commit 05dad0cd0f115a70a7c114c31ccc927f572188eb.