Revert 1f01303..d86d0c2

This rolls back to commit 1f01303bccf40e7fa6d0a1bc07408e67c160b84b.
This is the updated commit