Revert 9ca4d58..720d2a2

This rolls back to commit 9ca4d58419f33c56408ff35553aa99837dd4e669.