Revert "Sync with master"

This reverts commit 6bb7015d0f99301a3b3315d4688b621bfd93e4d3.
Reverting doubles