Revert 7ccc2fd..ae043cd

This rolls back to commit 7ccc2fd8add4e04faf3dae411b609e716d9ddcb7.