Revert a6aef8d..3619b1a

This rolls back to commit a6aef8d504e8d09cd6065e9f25660a0261417659.
..