Revert 607de68..302a714

This rolls back to commit 607de68f9c2a52de2db6280bc4e7741a8d01d380.