Revert fb6ca09..be1b748

This rolls back to commit fb6ca0989034ffee3878875c224fd74804bbd5e4.
Small changes to flat