Revert 631f78a..ca1b517

This rolls back to commit 631f78af97a14ca7230a69fbd0833e61a80c5d78.