Revert 16fb69e..e6cd62d

This rolls back to commit 16fb69e3988f5d3a4041aa430196e7206be5ed2b.
1