Revert aa61570..7a5ba0e

This rolls back to commit aa61570420072ca4a6dbdd47947b809cc14daa54.