Reverted broken changes from 11749a8