Revert 3c15713..35690bb

This rolls back to commit 3c15713ebc16e4f2fcb74ac41aa019165267ae2b.