Revert 7e49c3e..ed53e6d

This rolls back to commit 7e49c3e6e5e5cf6166d1e94f2881b04e5023d04e.