Revert 0f0f6da..b3c869b

This rolls back to commit 0f0f6dabc13539c5bd7eef1daa6db825dbd843b2.