Revert c937ae7..f43d90b

This rolls back to commit c937ae71564d7efdde71a15307c86ea1dc21fc91.
Revert f43d90b..b46e73b

This rolls back to commit f43d90b5d2fd2bd51a4b32bc20bb21de1625e229.