Revert 9644988..9377be5

This rolls back to commit 9644988c470bac8fc7592f1274094abf3e67f6b3.