Revert "4.0 compatibility? maybe?"

This reverts commit fa3e7ef82714de56f1b240bc1c1cab58cfe13efe.