Revert abb4e60..0ad6734

This rolls back to commit abb4e60d4cbf581e1f42ebffdad1015424a4d0b3.
Most recent stable