Revert aa6ad81..85b567c

This rolls back to commit aa6ad81ab00eea9b9e308d855bad672504d7dee3.