Revert 6307d93..2da7a4d

This rolls back to commit 6307d93a69d747578ac5125cd20de56c7b79e71f.