Revert d01a6e6..aec47a1

This rolls back to commit d01a6e60477009533974d7fafc3463a90af7773d.