Revert 8496840..a6c7977

This rolls back to commit 849684074bd8284c0b41cdc96cb4a3a475ae903d.
To be rolled back