Revert aea035a..9d746d2

This rolls back to commit aea035a215131ae44ca410d89e2300c75a34f18f.