Revert 2814045..a395774

This rolls back to commit 2814045aecd35cdc3bd2220e15d95bdb3a515453.
Revert c165a1c..b2daee3

This rolls back to commit c165a1c2afb0f7bb0454e20fc698f264734ef053.
Revert a395774..fad81cf

This rolls back to commit a3957740514f55d1ef56f5dfce327ce99e1a923f.