Revert 55850e3..aa57c42

This rolls back to commit 55850e32f432c1df2e407752fcf05394ac1378a6.