Revert b456ba7..63d3f80

This rolls back to commit b456ba7e9322bbbe745c2386100ab1ecc7f3c791.