Revert aa967cb..53904a4

This rolls back to commit aa967cb109b47ec44a9cea885ebf0be51100700e.