Revert 63eee69..28cb1ef

This rolls back to commit 63eee69c4b495722b43613d78a0190d6d00aea2e.