Revert 4678fd7..717863b

This rolls back to commit 4678fd742a256e55673d4fd38f8c06e24b1329b1.
Revert 717863b..8317b78

This rolls back to commit 717863b80e3effb4e1bc5033d0ffb2cb2650d755.