Revert 701b394..546a4ec

This rolls back to commit 701b394a152b4137465875681677e6caef031fbb.
Revert c6f0998..345e94c

This rolls back to commit c6f09985d00a7fe51d46506d4b486767a919d01d.