Revert 6df7e64..fa3ab7d

This rolls back to commit 6df7e646b8a3d93f5ec7e0194138798c7fc5f99b.