Revert e0b90e5..18a2c39

This rolls back to commit e0b90e58e584b18baf9ad06acf22a043a9bf06f4.
Revert a0148bd..7d74ddc

This rolls back to commit a0148bdc32a3cbbedc666eab1316997be224d6bc.
Fixed but Reverted, Like Buttons Work