Revert 1077a29..54ea09c

This rolls back to commit 1077a29eb96bea9aad5c6bb83fb306aad5ca73ba.