Revert 90aef56..2ad9ce0

This rolls back to commit 90aef56e66416fccf64c859dea4e1110203c619c.