Revert b4905ee..b147c9e

This rolls back to commit b4905ee76f83fb7901ef781b121f0ee3ff653faf.