Revert 8363c0b..8f82d7a

This rolls back to commit 8363c0b368cd9bbb69b0a50f88c65d5073d7cf68.