Revert 2d9173c..1bd62c3

This rolls back to commit 2d9173ca21852456569f2928d3eb5f8937724f58.