Revert d39374e..5a9c7fe

This rolls back to commit d39374ed793fb4d6dca18ba635b85d00034e2ff5.