Revert 90fa583..faf4d0e

This rolls back to commit 90fa583e073d5fe86d0333f412741a3c87b46def.