Revert 2316c30..bbc9c26

This rolls back to commit 2316c308cd2285cde766921cf984b41c4daf23f3.