Revert d1cbbe3..c5c3c78

This rolls back to commit d1cbbe3b1c71e2f63e0f6958e4a83d55d855e710.