Revert a7b39fe..d8beb24

This rolls back to commit a7b39fe1fe18061e4c52b989cc8e63621e91569f.
Save Point