Revert c23a001..11cb2c3

This rolls back to commit c23a0010a3b516ee4245766ff8c99a52a5e46619.