Revert 70d47eb..4262dc1

This rolls back to commit 70d47eb83f2e0fe972e9145a7f519037d20f0b8a.