Revert fbb4c33..d57f4df

This rolls back to commit fbb4c3353112ffe4ef0435396bdb9713d07a7fbf.