Revert a932076..11eb1bb

This rolls back to commit a9320768e3b667d44964c68f4f06e1f39bd2a498.