Revert faf38f2..e04e37d

This rolls back to commit faf38f24d712551244418c150e40fd4d14ea206d.