Revert 07a6f81..63bfeb3

This rolls back to commit 07a6f819e7baa7c218cffe70038259027ef7aa64.