Fixed (really)

Final revert / clean-up / fixed