Revert f238a8a..1bdbce2

This rolls back to commit f238a8a7afbb84ea8e197b0166407ed8da7390d4.