Revert 28115fa..e9e985f

This rolls back to commit 28115fa9653faf5e3f97b366c0bb4eb9691c44a5.