Revert 3ef49d6..0c961bb

This rolls back to commit 3ef49d681990341871a0a1e9d65a5696ac4db2e1.