Revert b6ffaa8..66a44b2

This rolls back to commit b6ffaa88b9f9604ddc6a5752768757a3b9a5dac2.