Revert 80eeb49..bb61741

This rolls back to commit 80eeb494e2a963e1e734045f9995e903d21fc5cf.