Revert [ac58551e55], needs more work