Revert 7283761..2f4e257

This rolls back to commit 72837617bcd856f2ef49b69352d6b574a7d66791.
Minor changes