Revert 737f8f5..e721508

This rolls back to commit 737f8f5ecd08ef5091f9730fedd635f83248a046.