Removed some cruft so it's working as expected again.