Revert 232f392..0ff6e6f

This rolls back to commit 232f392e601d7a226eb123c15f07cd7b1ca3a392.