Revert f3d1c24..d0cd5f2

This rolls back to commit f3d1c243434a153960d81c85886940d1b24188bb.