Revert 1e4758d..a6ab0f8

This rolls back to commit 1e4758db043f4cfe1950666d3bc30e90b575c5f7.