redstone event failed... going back to old way

next commit will remerge back into master