Revert 4e042cd..f36e399

This rolls back to commit 4e042cd155305250f3019ca3e3f0dd5ab85828a3.