Revert 65ca8ce..7d943ce

This rolls back to commit 65ca8cefaee5cabc42e4da1d6f2308ce1d0392e4.