Revert e27b538..4bc4252

This rolls back to commit e27b538d545ad324989fe851e09fd45573fe9baf.
Revert Right Button