Revert bc6200a..4ee58f6

This rolls back to commit bc6200abf2993a2b4a8392ff3c76c4c768fecce5.