Revert 27e5a60..cc5fc0a

This rolls back to commit 27e5a600c8bdada01083b5919d84abc4e496c734.
Revert a717aaa..4649468

This rolls back to commit a717aaa49ff9f8a01384113b801811008b0ed4ed.