Revert af32fc0..95c327c

This rolls back to commit af32fc09d8ee185ae22127ec3b8b1fc0cb773ea2.