Revert 5eca3bc..a249ecf

This rolls back to commit 5eca3bc7649f16cfb95c9705051ca18b3388b614.
Commit to catch up to current branch

Title