Revert af733bc..e3feca0

This rolls back to commit af733bcf6c6eda0dd334ef1557b1584416139ef1.