Revert c938b6e..91e2524

This rolls back to commit c938b6ec2dc86b0bd3121f0da9c8b97c5262bbec.
Revert c8ec568..6f4b5a0

This rolls back to commit c8ec5680c4da6e7c0dc5d1268e81c3717c65f246.