Revert c87b78c..139e686

This rolls back to commit c87b78cfafc807f08c0698c37307cb29f5e596f6.