Revert 9105b13..855cf13

This rolls back to commit 9105b138c4558fcc1e5e04e3a51479ca3fd39b2d.