Revert afa837a..507dc80

This rolls back to commit afa837a421a7ce232af3ad7cad6dec110de302c5.