Abandoning for now due to complicated test suite