Revert 7c72026..5ec593d

This rolls back to commit 7c720263c5221a6069ad1504dc6b4062fe37b7be.