Revert 1de63b0..754a8c1

This rolls back to commit 1de63b0e45f275a6992907b250e9e4be9b1f9eef.