Revert "Messed up merge"

This reverts commit 131a1bde5adc55d815c8ec27cd72b48cef713ee2.