Revert a7a31b8..cb8896a

This rolls back to commit a7a31b859f8ab77c6ccf249ccbf49ab775ec30a5.