Revert a737b0b..39e1f66

This rolls back to commit a737b0b2b3aa23c3fbfa7d8746006daf428c627d.