Revert ff8501a..d3b929f

This rolls back to commit ff8501a644c3f7e77d492fbdfb90f419fb6d08e7.