Revert 08df3bd..59769b6

This rolls back to commit 08df3bd9d54a6f054766307ceeaee914a8c9765b.