Revert d749b06..7ff9328

This rolls back to commit d749b0651e0dfc8a29e641a450326fa5f88d47d8.