Revert cbb9fcc..b4fb3a1

This rolls back to commit cbb9fcc86d3d7e775e80919d7283588d5747c44d.