Revert 82ca5d1..b4d0a08

This rolls back to commit 82ca5d1ae535ea98325e17fe899528ba26f03df7.
Revert b4d0a08..d7422e8

This rolls back to commit b4d0a08eb92d3a6628d44a5e06eb2b8b97c97318.