Revert "Fixed dumb issues."

This reverts commit 666a728327e07a77bfcc8967b78bb7168ac3a7cd.