Revert 512232c..a07c7a7

This rolls back to commit 512232c1269457155743af1a74116aa232ff66bb.