Revert 9e0172f..fba53bc

This rolls back to commit 9e0172f1ba08d4c30349baa4afad04f25f3156f2.
Revert ddecbc4..0621457

This rolls back to commit ddecbc4a6c534a685ef91868c8c733ffe8a8b8d1.