Revert b0dd80c..b6515af

This rolls back to commit b0dd80c28e52e5d3086527c32615bb6f90692f34.