Revert 96b54d8..c37b3e5

This rolls back to commit 96b54d8b3617d2d51008c4efc7eb4b3143a2ba44.