Revert aa4468b..d8cc51f

This rolls back to commit aa4468b0269177ef55eb0b49c4a4b8c9c88c133c.