Revert 05bc3e7..64d20a0

This rolls back to commit 05bc3e71b0c50d6c0e2cc44436efd1a19274bd00.