Revert 1911732..f550d93

This rolls back to commit 1911732414366fdf85bb7a4aba4247f18374758d.