Revert 2492301..ffec598

This rolls back to commit 2492301e88c08397e8a04d0b6258a31635e1954d.
FAILED