Revert 6e12f79..822dbc3

This rolls back to commit 6e12f79be3445b8320f3423891a5580adee04f42.