Revert 31bf8a8..cbb3b0a

This rolls back to commit 31bf8a8a83777fa076f03b06b2880495fbe5399d.