Revert 729a152..98b9bbd

This rolls back to commit 729a1522c1f6346a3ae7ee29736612758e129129.