Revert 68c799b..6eba7ee

This rolls back to commit 68c799bc5491543cc9112244c36b9a42f6f22055.