Switched to use new button implementation for "Return Skater", see #106