Revert a6f3f43..5e5fb6d

This rolls back to commit a6f3f4328e37d62612ff7009e9780720d6a0349b.