Revert cbcbebc..3d08916

This rolls back to commit cbcbebc4b16819e08626209dd78f9a49afb912e5.