Revert 35052c9..18c27d6

This rolls back to commit 35052c91399bcc14e41abcf04c5cedd4317aaa86.