Revert 53cd9b9..637c5a2

This rolls back to commit 53cd9b983c58b9327c793a348483d6601f2e9027.