Revert bfa27e3..7fed5b2

This rolls back to commit bfa27e39223828c94e0b0e2176dcccbb50c02719.