Revert f6f1bb5..626ebb8

This rolls back to commit f6f1bb5694eca704ef311213b4315898f379849a.