Revert 9845325..d270f21

This rolls back to commit 9845325afc2fb29139d3cdfbbe84b0184a4693bf.