Revert bebb824..6a88ae8

This rolls back to commit bebb82490f64bcc6c9d351d5ffc1bee5c139a6ae.