Revert aa9e351..483ba15

This rolls back to commit aa9e35166ef9b533f0e0813930285af477d356d0.