Revert 0360490..d1f41b9

This rolls back to commit 0360490b7a48d1fdef5fa4424e8eb963165a5cbc.
Revert 8ef56ff..397734a

This rolls back to commit 8ef56ff22b5dc9f33968692b7caff6e436ee4ecf.
Revert 0360490..f735ea5

This rolls back to commit 0360490b7a48d1fdef5fa4424e8eb963165a5cbc.