Revert 67d0ae3..c054512

This rolls back to commit 67d0ae33c88c6c851d37b8e70db041cab82e3c9d.