Revert 667d092..1677b63

This rolls back to commit 667d09297ebdb32180246118fdf612dc102216fe.