Revert 76b1545..4129f80

This rolls back to commit 76b15451e7fe2c2ce8683f4c3b28a1da86ec7512.