Revert "Synced fork BradCrumb/master"

This reverts commit ac3b3b7ee0ed6b49695a3707a6e9a99341eea019, reversing
changes made to 3f7b8fb02cffad79f43c80214de01f8dc7fe769e.