Revert 15425b9..6b40a50

This rolls back to commit 15425b9092bb6f4839a7cdca059a1da3c8729a61.