Revert 52cabe0..153c610

This rolls back to commit 52cabe08963542db8aaddc9226b0d4590680a900.