Revert 53da761..aecc7be

This rolls back to commit 53da76183b0ee28bc9e20e72fc79f1e9f1d4c0c9.